
<div class="panel panel-default">
	<div class="panel-heading">
		<h3 class="panel-title">合并主干</h3>
	</div>
	<div class="panel-body">
		<div class="form-group col-xs-12">
			<label class="col-xs-4 form-control-static">当前进度：</label>
			<div class="col-xs-8">{{mergeStatus | mergeStatusFilter }}</div>
		</div>
		<div class="form-group col-xs-12">
			<label class="col-xs-4 form-control-static">执行结果：</label>
			<div class="col-xs-8" ng-if="'noStart'!=mergeStatus">{{msgFlag|msgFlagFilter}} {{msgInfo}} </div>
			<div class="col-xs-8" ng-if="'noStart'==mergeStatus">{{msgInfo}} </div>
		</div>
		<div class="form-group col-xs-12">
			<label class="col-xs-4 form-control-static"></label>
			<div class="col-xs-8">
				<a class="btn btn-default" ng-click="button_clicked||mergeVersion();" ng-disabled="button_clicked"
					ng-if="version.hasPermissionMap['7016'] !=null && version.hasPermissionMap['7016']">合并到trunk</a>
			</div>
		</div>

	</div>
</div>

